Add back API docs merge to Makefile

I guess we can't do it as part of the crate, so we do it separately.

diff --git a/rust-bindings/rust/.gitlab-ci.yml b/rust-bindings/rust/.gitlab-ci.yml
index a05850d62c9141c3e11f8eda0cf10fdc5c6e8a20..55786322c71343d04cdcbd21339fc4bdaa33e409 100644 (file)
--- a/rust-bindings/rust/.gitlab-ci.yml
+++ b/rust-bindings/rust/.gitlab-ci.yml
@@ -42,8 +42,9 @@ libostree_nightly:
 docs:
   stage: docs
   script:
+  - make merge-lgpl-docs
   - cd libostree
-  - cargo doc --verbose --features "dox lgpl-docs"
+  - cargo doc --verbose --features dox
   artifacts:
     paths:
     - target/doc

diff --git a/rust-bindings/rust/Makefile b/rust-bindings/rust/Makefile
index f0ae0b70555503bd6f82e2d4db84a4fa3bbb75db..94b65b55a51d6944d5e044ad7d1971f3fdbac1f1 100644 (file)
--- a/rust-bindings/rust/Makefile
+++ b/rust-bindings/rust/Makefile
@@ -21,6 +21,15 @@ generate-libostree-sys: gir/libostree-sys
 generate-libostree: gir/libostree
 
 
+# -- LGPL docs generation --
+tools/bin/rustdoc-stripper:
+       cargo install --root tools -- rustdoc-stripper
+
+merge-lgpl-docs: tools/bin/gir tools/bin/rustdoc-stripper
+       tools/bin/gir -c conf/libostree.toml -m doc
+       tools/bin/rustdoc-stripper -g -o target/vendor.md
+
+
 # -- gir file management --
 update-gir-files: \
        remove-gir-files \

diff --git a/rust-bindings/rust/conf/libostree.toml b/rust-bindings/rust/conf/libostree.toml
index 7bd1ae1b096fa5b52331419e584988dd3c31a25f..1b87167d27c39c8f6442b4eb14f848ed76023f38 100644 (file)
--- a/rust-bindings/rust/conf/libostree.toml
+++ b/rust-bindings/rust/conf/libostree.toml
@@ -3,6 +3,7 @@ work_mode = "normal"
 library = "OSTree"
 version = "1.0"
 target_path = "../libostree"
+doc_target_path = "../target/vendor.md"
 deprecate_by_min_version = true
 
 girs_dir = "../gir-files"